Cleaning unnecessary code

Cleaning unnecessary code as discussed in #4452.
This should do it!

Thanks!