user.class.php cleanup