Final Clean up before merge