Remove crappy code