Removed all for new admin