Removing unused dead code from previous version