Merge "Cleaned up unused code in Program" into devel/master