Removed unused functions
Removed more unused functions
Removed more stuff..