Removed some incomplete features