Removed unused code after latest change