remove hardcoding