Remove custom code