removed merge leftover things