Removed some older redundant code. Taken out property file code for current trial version.