Sources cleaned up