Cleaned up inherited items from project 2