merge leftover cleanup