Removed if/else blocking links