Remove Undefined

#### Resolves #58