Final Clean Up, should work