Cleaned up old sources