removing no longer used code. Hooray refactoring