remove merge leftover and updated class names