removing custom stuff