Update readme, remove legacy macros