removed old source
Fixed errors with type conflicts.