Clean up unnecessary logic