Android: code cleanup
Server: Data stub