cleaned up most of storage, code completion now works