Cleaning white spaces
Drop 1.8 support