Removed unused libraries / fixed warnings