Fixes #2. Removed Unused constructor and functions