generalized cleanup and removed atomic_move return

removed return code as it doesn't make sense anymore