Remove obsolete stuff, credits :- rebelos