Fixed and revoked the Money changes

* Readded the removal of getters and setters. Form component need them