Code cleanup opdr5