Cleanup and add Interface Objects