Stripping out some stuff for testing