Removed for session bugs