Removed a lot of excess