cleaned up some dead code
resolved conflicts prior to merge