Code cleanup, remove unused libraries.