Remove old stuff needed for Objective-C
Fight with bundle stupid