clean up some extraneous code
Merge branch 'profileView' into dev