emoved unneeded elements, moved to partials for future use