Removed unneeded code and packages