Removed merge leftover