Cleaning code base, removing old assignment parts