Cleanup, added WIP for restricting access based on user type.