Removed populate_links method - no reason