Cut out unnecessary code