remove unused class
remove constants and adapt usage
modify serial cache to get the right variable from the cache
remove unused methods