Removed some old features and optimised some current ones