cleaned up a few files prior to merging with vik's branch