Added a lot of unclean stuff, cleaning required before continuing