Refactor aws package - remove stale code

Signed-off-by: Harshavardhana <harsha@harshavardhana.net>