Clean up new Abstracts and move code