Removed unnecessary form factors