Cleaned up init-custom