Removed some iffy features