Removing rest of code that ended up to wrong place