Code cleaning, removing unused stuff