Removing legacy and redundant code.