Clean up removal code to stop checking the user that created the unit