Remove stuff used for testing