Cleaning warnings / unused code