Remove developmental code from master version