Deleted old/duplicate code