Clean up unnecessary code