removing unused code

Was going through the code and realized we have some dead code lying around.
Cleaned it up.
Tested it out. Seems fine.