Flatten OTP dependencies
Finish cleanup