Removed extrenuous fields in forms