Removing a ton conditional compilation

Mostly for old compact framework and non generic version