cleaning up functionality that was broken in last commit