remove custom
Fix stuff