Got rid of some dirty hacks..