Removed remaining components from SM version
Updated PTM. Beginning to fix introduced errors in serial version
Serial now compiles again (but untested)