more cleaning up code
recovering from change to git (re-adding references etc)