Tidy up some redundant code

No need for those functions.