Cleaning up and moving stuff into server init block