Clean-up and removing helper methods from client facing data objects