Cleaned up some legacy copatibility & TODOs