Removed TODO from page classes