Removing obsolete code, cleaning and such