Removed old stuff from the temporary labels-as-properties solution