Removed some unused features