Cleaning up code

Removed test code and suppressed a serialization warning