Removed the rest of #defines