Cleanup + better community keys