Removed unnecessary props