Clean up unnecessary functions