remove even more code that is not needed anymore