Remove old methods

These methods are not needed for some time
Just a cleanup.