Removed bus construct
Server cleanup