Cleaned up previous source