Cleaned up weapon base