remove extra constants