Remove previous bodgery no longer needed