Cleaned up closer replacement and added mysql-functions to it