Clean up. Removing conque, doing better ft stuff