remove hardcoded stuff