Removed some unused code and data