Got rid of custom-hacks