Clean up compiler warnings; remove unnecessary function