[bugfix] Removing some unneeded code.