CS / Unit testing / Removed unused code