Updates to code

Cleaned up code, Added function to remove points from Derivative and
Second Derivative to clear them for load.