Remove all warnings. Code clean up