remove hardcodes