Removed unused libraries and utilities