removed unused files, added support for properties