Remove unused code

Just remove the unused code to make the code clearer.