Cleaned some cruft which was left due to kernel patches