removing stuff I mistakenly merged into develop