Remove bad dependency between view controllers