Removed some crud