clean up routines

Signed-off-by: Adam Stokes <hackr@cypherbook.com>