Removing unused constants/imports