Removing not used code