Removed alot of unused code; Again heavy refactoring...