Cleaned the code a bit.
Commented out the SQlite implementation for now.