obsolete: removing toa and some other stuff