Made changes and moved to Parse BE
Removed old code and whitespace