Removing some constants