removed old code made redundant from the refactor