Remove some buggy helper code & move it into tests to avoid eclipse issue