Bug Fixes

forgot to delete part of old code