docblock and removing legacy code