Cleaned remnants of previous erroneous implementation.