removing some code dupes