Removed client-side stations storage, more code cleanup