Card #139: Remove v1 logic

https://trello.com/c/vX3Hrvdf

- Removed some v1 branching logic from application