Cleaning up old code
More clean up
Updated ingore