Removed command, cleaned import and unused variables