Gun-management refactoring

Deleted commented statesments