Remove old code that is irrelavent