Removed some unneeded code, see #138 and see #140.