Fix #364 - Remove old code

Love the smell of removed code in the morning :tada: