Removed redundant utility methods, sightly improved imports