Removed amount from wrapper
Deleted old shuttle window