New changes and cleanup