ts3 cleanup and push