cleaning up empty command:  some leftovers from enterprise branch... + some unneccessary SQL statements
cleaning up empty command:  some leftovers from enterprise branch... + some unneccessary SQL statements

frePPLe/frePPLe,frePPLe/frePPLe,frePPLe/frePPLe,frePPLe/frePPLe,frePPLe/frePPLe,frePPLe/frePPLe