Removing redundant code, warnings.