More clean up
Merge branch 'development' of https://github.com/PhilGeek/formwithoutmatter into development

because im an idiot
Merge branch 'development' of https://github.com/PhilGeek/formwithoutmatter into development
Merge branch 'development' of https://github.com/PhilGeek/formwithoutmatter into development