Removed unfinished option to specify load/save databases. Cleaned up code