Minor refactor

Removed unnecessary code