cleaned out cache and constants that are never used