Unused code removed [code improvements]