Fixed user profile + cleanup