WIP. Removed unused class properties. Fixed some routes