Removed some unused bits