Move queries to service admin

Some queries where moved from database to admin and superfluous classes removed