Clean up skeleton and module import stuff