Second commit, no error handling.
Removed unused file.
Removed