Remove stupid shit that was causing all the problems