Cleaning Up
No cache on user control
Including variables in hash
Merge branch 'feature/CleanUp' into develop