Removed all corePlot
Cleaned some warnings