Removed unecessary packages/code