Removed curtis specific stuff