Cleaned up clib/src