Corrected whitespaces and removed unused libs