Remove dependency on mysql::server class