Cleaning up, removing functions not yet implemented