Added remove unused option