Removed a great deal of unused code and packages