Dev

Added cleanup methods, removed static names for service, fix test issues.